Rename FtpsiteAgent#transaction to saving_entries to avoid name conflict.

Akinori MUSHA 10 anos atrás
pai
commit
fc822e6c92
1 arquivos alterados com 3 adições e 3 exclusões
  1. 3 3
      app/models/agents/ftpsite_agent.rb

+ 3 - 3
app/models/agents/ftpsite_agent.rb

@@ -82,7 +82,7 @@ module Agents
82 82
     end
83 83
 
84 84
     def check
85
-      transaction do |found|
85
+      saving_entries do |found|
86 86
         each_entry { |filename, mtime|
87 87
           found[filename, mtime]
88 88
         }
@@ -177,14 +177,14 @@ module Agents
177 177
       @base_uri ||= URI(options['url'])
178 178
     end
179 179
 
180
-    def transaction
180
+    def saving_entries
181 181
       known_entries = memory['known_entries'] || {}
182 182
       found_entries = {}
183 183
       new_files = []
184 184
 
185 185
       yield proc { |filename, mtime|
186 186
         found_entries[filename] = misotime = mtime.utc.iso8601
187
-        unless prev = known_entries[filename] and misotime <= prev
187
+        unless (prev = known_entries[filename]) && misotime <= prev
188 188
           new_files << filename
189 189
         end
190 190
       }